[IA64] Reseve memory of domain0 (fix dom0 boot panic)

Our patch fix domain0 boot panic on large memory system.
(e.g. amount of installed memory is 16GB)

Memory of domain0 is not reserved now.
Our patch can make this memory reserved.
And we clean up initrd_start of domain0.

Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>
Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>

diff --git a/xen/arch/ia64/linux-xen/setup.c b/xen/arch/ia64/linux-xen/setup.c
index 50854368e5812b9d72bd3b3fdc45912210b5b010..eb7d7a1d6f0901596f716f73777d194a45d8cf95 100644 (file)
--- a/xen/arch/ia64/linux-xen/setup.c
+++ b/xen/arch/ia64/linux-xen/setup.c
@@ -235,7 +235,13 @@ reserve_memory (void)
 #endif
        n++;
 
-#ifdef CONFIG_BLK_DEV_INITRD
+#ifdef XEN
+       rsvd_region[n].start = (unsigned long) __va(ia64_boot_param->domain_start);
+       rsvd_region[n].end   = (rsvd_region[n].start + ia64_boot_param->domain_size);
+       n++;
+#endif
+
+#if defined(XEN)||defined(CONFIG_BLK_DEV_INITRD)
        if (ia64_boot_param->initrd_start) {
                rsvd_region[n].start = (unsigned long)__va(ia64_boot_param->initrd_start);
                rsvd_region[n].end   = rsvd_region[n].start + ia64_boot_param->initrd_size;

diff --git a/xen/arch/ia64/xen/dom_fw.c b/xen/arch/ia64/xen/dom_fw.c
index ba21f846c57dda91482e6b35409855eaac5717f8..7e8c63b1f785c5fea54f4602adc68343617ff34f 100644 (file)
--- a/xen/arch/ia64/xen/dom_fw.c
+++ b/xen/arch/ia64/xen/dom_fw.c
@@ -1019,8 +1019,7 @@ dom_fw_init (struct domain *d, const char *args, int arglen, char *fw_mem, int f
        if (d == dom0) {
                // XXX CONFIG_XEN_IA64_DOM0_VP
                // initrd_start address is hard coded in start_kernel()
-               bp->initrd_start = (dom0_start+dom0_size) -
-                 (PAGE_ALIGN(ia64_boot_param->initrd_size) + 4*1024*1024);
+               bp->initrd_start = ia64_boot_param->initrd_start;
                bp->initrd_size = ia64_boot_param->initrd_size;
        }
        else {

diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c
index 39f1919bf588f87d559b5e4b83b5b41d502cc300..b2e3c2c79a5a3a709420841a28cdb7876445aeb0 100644 (file)
--- a/xen/arch/ia64/xen/xensetup.c
+++ b/xen/arch/ia64/xen/xensetup.c
@@ -279,16 +279,17 @@ void start_kernel(void)
     memmove(__va(initial_images_start),
           __va(ia64_boot_param->domain_start),
           ia64_boot_param->domain_size);
-//    ia64_boot_param->domain_start = initial_images_start;
+    ia64_boot_param->domain_start = initial_images_start;
 
     printk("ready to move initrd to 0x%lx with len %lx...",
           initial_images_start+PAGE_ALIGN(ia64_boot_param->domain_size),
           ia64_boot_param->initrd_size);
     memmove(__va(initial_images_start+PAGE_ALIGN(ia64_boot_param->domain_size)),
-
           __va(ia64_boot_param->initrd_start),
           ia64_boot_param->initrd_size);
     printk("Done\n");
+    ia64_boot_param->initrd_start = initial_images_start +
+       PAGE_ALIGN(ia64_boot_param->domain_size);
 
     /* first find highest page frame number */
     max_page = 0;

diff --git a/xen/include/asm-ia64/linux-xen/asm/README.origin b/xen/include/asm-ia64/linux-xen/asm/README.origin
index 0e0771bd4e43c22b29340febf89366941a5629cd..8defd25e63c4e4b84c408688c0c142b4b586861c 100644 (file)
--- a/xen/include/asm-ia64/linux-xen/asm/README.origin
+++ b/xen/include/asm-ia64/linux-xen/asm/README.origin
@@ -11,6 +11,7 @@ ia64regs.h            -> linux/include/asm-ia64/ia64regs.h
 io.h                   -> linux/include/asm-ia64/io.h
 kregs.h                        -> linux/include/asm-ia64/kregs.h
 mca_asm.h              -> linux/include/asm-ia64/mca_asm.h
+meminit.h              -> linux/include/asm-ia64/meminit.h
 page.h                 -> linux/include/asm-ia64/page.h
 pal.h                  -> linux/include/asm-ia64/pal.h
 pgalloc.h              -> linux/include/asm-ia64/pgalloc.h

diff --git a/xen/include/asm-ia64/linux-xen/asm/meminit.h b/xen/include/asm-ia64/linux-xen/asm/meminit.h
new file mode 100644 (file)
index 0000000..1761d73
--- /dev/null
+++ b/xen/include/asm-ia64/linux-xen/asm/meminit.h
@@ -0,0 +1,70 @@
+#ifndef meminit_h
+#define meminit_h
+
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/config.h>
+
+/*
+ * Entries defined so far:
+ *     - boot param structure itself
+ *     - memory map
+#ifndef XEN
+ *     - initrd (optional)
+#endif
+ *     - command line string
+ *     - kernel code & data
+#ifdef XEN
+ *     - dom0 code & data
+ *     - initrd (optional)
+#endif
+ *
+ * More could be added if necessary
+ */
+#ifndef XEN
+#define IA64_MAX_RSVD_REGIONS 5
+#else
+#define IA64_MAX_RSVD_REGIONS 6
+#endif
+
+struct rsvd_region {
+       unsigned long start;    /* virtual address of beginning of element */
+       unsigned long end;      /* virtual address of end of element + 1 */
+};
+
+extern struct rsvd_region rsvd_region[IA64_MAX_RSVD_REGIONS + 1];
+extern int num_rsvd_regions;
+
+extern void find_memory (void);
+extern void reserve_memory (void);
+extern void find_initrd (void);
+extern int filter_rsvd_memory (unsigned long start, unsigned long end, void *arg);
+
+/*
+ * For rounding an address to the next IA64_GRANULE_SIZE or order
+ */
+#define GRANULEROUNDDOWN(n)    ((n) & ~(IA64_GRANULE_SIZE-1))
+#define GRANULEROUNDUP(n)      (((n)+IA64_GRANULE_SIZE-1) & ~(IA64_GRANULE_SIZE-1))
+#define ORDERROUNDDOWN(n)      ((n) & ~((PAGE_SIZE<<MAX_ORDER)-1))
+
+#ifdef CONFIG_DISCONTIGMEM
+  extern void call_pernode_memory (unsigned long start, unsigned long len, void *func);
+#else
+# define call_pernode_memory(start, len, func) (*func)(start, len, 0)
+#endif
+
+#define IGNORE_PFN0    1       /* XXX fix me: ignore pfn 0 until TLB miss handler is updated... */
+
+#ifdef CONFIG_VIRTUAL_MEM_MAP
+# define LARGE_GAP     0x40000000 /* Use virtual mem map if hole is > than this */
+  extern unsigned long vmalloc_end;
+  extern struct page *vmem_map;
+  extern int find_largest_hole (u64 start, u64 end, void *arg);
+  extern int create_mem_map_page_table (u64 start, u64 end, void *arg);
+#endif
+
+#endif /* meminit_h */

diff --git a/xen/include/asm-ia64/linux/asm/README.origin b/xen/include/asm-ia64/linux/asm/README.origin
index 784483de5875b05e653eaaee825847fa30db23db..02fc26e5e06d22a9eebfac271e5f5a1931694685 100644 (file)
--- a/xen/include/asm-ia64/linux/asm/README.origin
+++ b/xen/include/asm-ia64/linux/asm/README.origin
@@ -27,7 +27,6 @@ linkage.h             -> linux/include/asm-ia64/linkage.h
 machvec.h              -> linux/include/asm-ia64/machvec.h
 machvec_hpsim.h                -> linux/include/asm-ia64/machvec_hpsim.h
 mca.h                  -> linux/include/asm-ia64/mca.h
-meminit.h              -> linux/include/asm-ia64/meminit.h
 numa.h                 -> linux/include/asm-ia64/numa.h
 numnodes.h             -> linux/include/asm-ia64/numnodes.h
 param.h                        -> linux/include/asm-ia64/param.h

diff --git a/xen/include/asm-ia64/linux/asm/meminit.h b/xen/include/asm-ia64/linux/asm/meminit.h
deleted file mode 100644 (file)
index 1590dc6..0000000
--- a/xen/include/asm-ia64/linux/asm/meminit.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef meminit_h
-#define meminit_h
-
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#include <linux/config.h>
-
-/*
- * Entries defined so far:
- *     - boot param structure itself
- *     - memory map
- *     - initrd (optional)
- *     - command line string
- *     - kernel code & data
- *
- * More could be added if necessary
- */
-#define IA64_MAX_RSVD_REGIONS 5
-
-struct rsvd_region {
-       unsigned long start;    /* virtual address of beginning of element */
-       unsigned long end;      /* virtual address of end of element + 1 */
-};
-
-extern struct rsvd_region rsvd_region[IA64_MAX_RSVD_REGIONS + 1];
-extern int num_rsvd_regions;
-
-extern void find_memory (void);
-extern void reserve_memory (void);
-extern void find_initrd (void);
-extern int filter_rsvd_memory (unsigned long start, unsigned long end, void *arg);
-
-/*
- * For rounding an address to the next IA64_GRANULE_SIZE or order
- */
-#define GRANULEROUNDDOWN(n)    ((n) & ~(IA64_GRANULE_SIZE-1))
-#define GRANULEROUNDUP(n)      (((n)+IA64_GRANULE_SIZE-1) & ~(IA64_GRANULE_SIZE-1))
-#define ORDERROUNDDOWN(n)      ((n) & ~((PAGE_SIZE<<MAX_ORDER)-1))
-
-#ifdef CONFIG_DISCONTIGMEM
-  extern void call_pernode_memory (unsigned long start, unsigned long len, void *func);
-#else
-# define call_pernode_memory(start, len, func) (*func)(start, len, 0)
-#endif
-
-#define IGNORE_PFN0    1       /* XXX fix me: ignore pfn 0 until TLB miss handler is updated... */
-
-#ifdef CONFIG_VIRTUAL_MEM_MAP
-# define LARGE_GAP     0x40000000 /* Use virtual mem map if hole is > than this */
-  extern unsigned long vmalloc_end;
-  extern struct page *vmem_map;
-  extern int find_largest_hole (u64 start, u64 end, void *arg);
-  extern int create_mem_map_page_table (u64 start, u64 end, void *arg);
-#endif
-
-#endif /* meminit_h */